Skip to content

Commit

Permalink
Merge branch 'develop-hugo' into develop-deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
uo288543 committed Apr 23, 2024
2 parents bc864fa + 2ee61c4 commit 3718632
Show file tree
Hide file tree
Showing 177 changed files with 57,615 additions and 2,345 deletions.
16 changes: 15 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build
on:
push:
branches: [master, develop, develop-deploy]
branches: [master, develop, develop-deploy, develop-teresa]

pull_request:
types: [opened, synchronize, reopened]
Expand Down Expand Up @@ -31,3 +31,17 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
e2e-tests:
needs: [unit-tests]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 20
- run: npm --prefix users install
- run: npm --prefix questions install
- run: npm --prefix gatewayservice install
- run: npm --prefix webapp install
- run: npm --prefix webapp run build
- run: npm --prefix webapp run test:e2e
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ This repo is an application composed of several components.
- **Gateway service**. Express service that is exposed to the public and serves as a proxy to the two previous ones.
- **Users**. Express service that handles the managment of the users and their groups in the system.
- **Questions**. Express service that handles the management of the questions generated for the game in the system.
- **Multiplayer**. Express service that hosts the multiplayer for the react game.

The Users service uses a MariaDB DBMS accesed with sequelizer and questions service uses MongoDB accesed with mongoose.

Expand Down
35 changes: 35 additions & 0 deletions android-apk/wiq-infinite-quest/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Learn more https://docs.github.com/en/get-started/getting-started-with-git/ignoring-files

# dependencies
node_modules/

# Expo
.expo/
dist/
web-build/

# Native
*.orig.*
*.jks
*.p8
*.p12
*.key
*.mobileprovision

# Metro
.metro-health-check*

# debug
npm-debug.*
yarn-debug.*
yarn-error.*

# macOS
.DS_Store
*.pem

# local env files
.env*.local

# typescript
*.tsbuildinfo
24 changes: 24 additions & 0 deletions android-apk/wiq-infinite-quest/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import { StyleSheet, Platform, StatusBar, SafeAreaView } from 'react-native';
import { WebView } from 'react-native-webview';

const styles = StyleSheet.create({
container: {
flex: 1,
paddingTop: Platform.OS === 'android' ? StatusBar.currentHeight : 0,
},
webview: {
flex: 1,
},
});

export default function App() {
return (
<SafeAreaView style={{flex:1}}>
<WebView
source={{ uri: 'http://wikiquest.sytes.net' }}
style={styles.webview}
/>
</SafeAreaView>
);
}
47 changes: 47 additions & 0 deletions android-apk/wiq-infinite-quest/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"expo": {
"name": "wiq-infinite-quest",
"slug": "wiq-infinite-quest",
"version": "1.0.0",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "light",
"splash": {
"image": "./assets/splash.png",
"resizeMode": "contain",
"backgroundColor": "#ffffff"
},
"assetBundlePatterns": [
"**/*"
],
"ios": {
"supportsTablet": true
},
"android": {
"adaptiveIcon": {
"foregroundImage": "./assets/adaptive-icon.png",
"backgroundColor": "#ffffff"
},
"permissions":["network"],
"package": "com.uo288543.wiqinfinitequest"
},
"web": {
"favicon": "./assets/favicon.png"
},
"extra": {
"eas": {
"projectId": "5c063487-930c-4361-831f-07d118410b96"
}
},
"plugins": [
[
"expo-build-properties",
{
"android": {
"usesCleartextTraffic": true
}
}
]
]
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android-apk/wiq-infinite-quest/assets/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android-apk/wiq-infinite-quest/assets/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android-apk/wiq-infinite-quest/assets/splash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions android-apk/wiq-infinite-quest/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = function(api) {
api.cache(true);
return {
presets: ['babel-preset-expo'],
};
};
18 changes: 18 additions & 0 deletions android-apk/wiq-infinite-quest/eas.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"cli": {
"version": ">= 7.8.0"
},
"build": {
"development": {
"developmentClient": true,
"distribution": "internal"
},
"preview": {
"distribution": "internal"
},
"production": {}
},
"submit": {
"production": {}
}
}
Loading

0 comments on commit 3718632

Please sign in to comment.