Skip to content

Commit b26e9ad

Browse files
authored
Merge pull request #109 from evansuong/backend/misc
Frontend Icons and Splash Pages
2 parents d564f37 + 637be5a commit b26e9ad

File tree

11 files changed

+382
-219
lines changed

11 files changed

+382
-219
lines changed

backend/server/server.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ app.use("/notifications", notifications);
4040
app.use("/users", users);
4141

4242
// Cron - Cloud Function usage
43-
cron.schedule("0 0 0 * * *", function () {
44-
// Run at 00:00:00
45-
logger.warn("It's 00:00. Resetting all user hug counts :)");
43+
cron.schedule("0 0 8 * * *", function () {
44+
// Run at 00:00:00 (00:00 PST) == (08:00 UTC)
45+
let d = new Date(Date.now());
46+
let timeString = d.toTimeString();
47+
logger.warn(`It's ${timeString}. Resetting all user hug counts :)`);
4648
CloudFunctionsAPI.resetUserHugCounts();
4749
});
4850

frontend/.expo-shared/README.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
> Why do I have a folder named ".expo-shared" in my project?
2+
3+
The ".expo-shared" folder is created when running commands that produce state that is intended to be shared with all developers on the project. For example, "npx expo-optimize".
4+
5+
> What does the "assets.json" file contain?
6+
7+
The "assets.json" file describes the assets that have been optimized through "expo-optimize" and do not need to be processed again.
8+
9+
> Should I commit the ".expo-shared" folder?
10+
11+
Yes, you should share the ".expo-shared" folder with your collaborators.

frontend/app.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"expo": {
3-
"name": "fouro-application",
4-
"slug": "fouro-application",
3+
"name": "Fouro",
4+
"slug": "fouro",
55
"version": "1.0.0",
66
"orientation": "portrait",
7-
"icon": "./assets/icon.png",
7+
"icon": "./assets/images/icon.png",
88
"splash": {
9-
"image": "./assets/splash.png",
9+
"image": "./assets/images/splash.png",
1010
"resizeMode": "contain",
1111
"backgroundColor": "#ffffff"
1212
},
@@ -30,12 +30,15 @@
3030
},
3131
"android": {
3232
"adaptiveIcon": {
33-
"foregroundImage": "./assets/adaptive-icon.png",
33+
"foregroundImage": "./assets/images/adaptive-icon.png",
3434
"backgroundColor": "#FFFFFF"
35-
}
35+
},
36+
"package": "com.teamcafe.fouro"
3637
},
3738
"web": {
3839
"favicon": "./assets/favicon.png"
39-
}
40+
},
41+
"description": "Fouro is an iOS/Android application that allows you to send virtual hugs to friends and feel close and connected to others. Fouro will help remind you to reach out to friends you haven't connected with in a while as well as serve as a platform to share and store memories together. Send and receive hugs with friends and stay socially connected to loved ones around you!\n",
42+
"githubUrl": "https://github.com/evansuong/fouro-application"
4043
}
4144
}

frontend/assets/adaptive-icon.png

-17.1 KB
Binary file not shown.

frontend/assets/icon.png

-21.9 KB
Binary file not shown.
28.6 KB
Loading

frontend/assets/images/icon.png

40.8 KB
Loading

frontend/assets/images/splash.png

34.7 KB
Loading

frontend/assets/splash.png

-47.3 KB
Binary file not shown.

frontend/src/API.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import axios from "axios";
22

3-
const server = "http://192.168.50.7:3000";
3+
const server = "http://54.244.107.90:3000"; // AWS server
44

55
const onAccept = (res, response) => {
66
// console.log('API 6 accepting');

0 commit comments

Comments
 (0)