From e36f0c2bd80e512e0e91f45c4ac42a53b0f97ae1 Mon Sep 17 00:00:00 2001 From: timdh94 Date: Fri, 8 Oct 2021 14:34:51 -0400 Subject: [PATCH 001/212] Created template server folder --- server/.gitignore | 3 +++ server/package.json | 14 ++++++++++++++ server/src/index.ts | 0 3 files changed, 17 insertions(+) create mode 100644 server/.gitignore create mode 100644 server/package.json create mode 100644 server/src/index.ts diff --git a/server/.gitignore b/server/.gitignore new file mode 100644 index 0000000..031ff7e --- /dev/null +++ b/server/.gitignore @@ -0,0 +1,3 @@ +.env +node_modules + diff --git a/server/package.json b/server/package.json new file mode 100644 index 0000000..d730877 --- /dev/null +++ b/server/package.json @@ -0,0 +1,14 @@ +{ + "name": "server", + "version": "1.0.0", + "description": "habit", + "main": "index.ts", + "scripts": { + "test": "npm t" + }, + "keywords": [ + "habit" + ], + "author": "", + "license": "MIT" +} diff --git a/server/src/index.ts b/server/src/index.ts new file mode 100644 index 0000000..e69de29 From 7abf64ed8ecb1f16ba195096f294044e2908c100 Mon Sep 17 00:00:00 2001 From: timdh94 Date: Fri, 8 Oct 2021 14:40:20 -0400 Subject: [PATCH 002/212] Added ts config --- server/src/config.ts | 0 server/thing.sql | 90 ++++++++++++++++++++++++++++++++++++++++++++ server/tsconfig.json | 72 +++++++++++++++++++++++++++++++++++ 3 files changed, 162 insertions(+) create mode 100644 server/src/config.ts create mode 100644 server/thing.sql create mode 100644 server/tsconfig.json diff --git a/server/src/config.ts b/server/src/config.ts new file mode 100644 index 0000000..e69de29 diff --git a/server/thing.sql b/server/thing.sql new file mode 100644 index 0000000..f48d80a --- /dev/null +++ b/server/thing.sql @@ -0,0 +1,90 @@ +CREATE TABLE "user" ( + "id" int, + "firstName" string, + "lastName" string, + "userName" string, + "email" string, + "password" string, + "EXP" int, + "level" int +); + +CREATE TABLE "taskHistory" ( + "userId" int, + "questId" int, + "taskId" int, + "completedDate" int, + "completed" boolean, + "textInput" string, + "userPicture" string +); + +CREATE TABLE "activeQuests" ( + "userId" int, + "questId" int, + "startDate" int, + "progress" int, + "taskId" int +); + +CREATE TABLE "completedQuests" ( + "userId" int, + "questId" int, + "startDate" int, + "progress" int +); + +CREATE TABLE "quests" ( + "id" int, + "duration" int, + "name" string, + "description" string, + "category" string, + "missedCheckIn" boolean, + "completionEXPValue" int +); + +CREATE TABLE "tasks" ( + "questId" int, + "taskDescription" string, + "id" int, + "EXPValue" int, + "nextTaskId" int, + "previousTaskId" int +); + +CREATE TABLE "achievementsDictionary" ( + "id" int, + "description" string, + "img" string, + "category" string, + "criteria" string +); + +CREATE TABLE "achievementsByUser" ( + "id" int, + "userId" int, + "achievementId" int +); + +ALTER TABLE "activeQuests" ADD FOREIGN KEY ("userId") REFERENCES "user" ("id"); + +ALTER TABLE "activeQuests" ADD FOREIGN KEY ("questId") REFERENCES "quests" ("id"); + +ALTER TABLE "tasks" ADD FOREIGN KEY ("questId") REFERENCES "quests" ("id"); + +ALTER TABLE "activeQuests" ADD FOREIGN KEY ("taskId") REFERENCES "tasks" ("id"); + +ALTER TABLE "completedQuests" ADD FOREIGN KEY ("userId") REFERENCES "user" ("id"); + +ALTER TABLE "taskHistory" ADD FOREIGN KEY ("userId") REFERENCES "user" ("id"); + +ALTER TABLE "taskHistory" ADD FOREIGN KEY ("questId") REFERENCES "quests" ("id"); + +ALTER TABLE "taskHistory" ADD FOREIGN KEY ("taskId") REFERENCES "tasks" ("id"); + +ALTER TABLE "completedQuests" ADD FOREIGN KEY ("questId") REFERENCES "quests" ("id"); + +ALTER TABLE "achievementsByUser" ADD FOREIGN KEY ("achievementId") REFERENCES "achievementsDictionary" ("id"); + +ALTER TABLE "achievementsByUser" ADD FOREIGN KEY ("userId") REFERENCES "user" ("id"); diff --git a/server/tsconfig.json b/server/tsconfig.json new file mode 100644 index 0000000..194d0d1 --- /dev/null +++ b/server/tsconfig.json @@ -0,0 +1,72 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig.json to read more about this file */ + + /* Basic Options */ + // "incremental": true, /* Enable incremental compilation */ + "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'. */ + "module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */ + // "lib": [], /* Specify library files to be included in the compilation. */ + // "allowJs": true, /* Allow javascript files to be compiled. */ + // "checkJs": true, /* Report errors in .js files. */ + // "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', 'react', 'react-jsx' or 'react-jsxdev'. */ + // "declaration": true, /* Generates corresponding '.d.ts' file. */ + // "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */ + // "sourceMap": true, /* Generates corresponding '.map' file. */ + // "outFile": "./", /* Concatenate and emit output to single file. */ + // "outDir": "./", /* Redirect output structure to the directory. */ + // "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */ + // "composite": true, /* Enable project compilation */ + // "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */ + // "removeComments": true, /* Do not emit comments to output. */ + // "noEmit": true, /* Do not emit outputs. */ + // "importHelpers": true, /* Import emit helpers from 'tslib'. */ + // "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */ + // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ + + /* Strict Type-Checking Options */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* Enable strict null checks. */ + // "strictFunctionTypes": true, /* Enable strict checking of function types. */ + // "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */ + // "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */ + // "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */ + // "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */ + + /* Additional Checks */ + // "noUnusedLocals": true, /* Report errors on unused locals. */ + // "noUnusedParameters": true, /* Report errors on unused parameters. */ + // "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */ + // "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */ + // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an 'override' modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Require undeclared properties from index signatures to use element accesses. */ + + /* Module Resolution Options */ + // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ + // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ + // "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ + // "typeRoots": [], /* List of folders to include type definitions from. */ + // "types": [], /* Type declaration files to be included in compilation. */ + // "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ + "esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ + // "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + + /* Source Map Options */ + // "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */ + // "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */ + + /* Experimental Options */ + // "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */ + // "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */ + + /* Advanced Options */ + "skipLibCheck": true, /* Skip type checking of declaration files. */ + "forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */ + } +} From f965091018296c1e5ff389c2c98b3e75c9f7698b Mon Sep 17 00:00:00 2001 From: Sean Araujo Date: Fri, 8 Oct 2021 16:03:29 -0400 Subject: [PATCH 003/212] Front end component navigation --- Client/App.tsx | 39 ++++ Client/Screens/HomeScreen.tsx | 12 + Client/Screens/ProfileScreen.tsx | 12 + Client/package-lock.json | 383 ++++++++++++++++++++++++++++++- Client/package.json | 6 +- 5 files changed, 450 insertions(+), 2 deletions(-) create mode 100644 Client/App.tsx create mode 100644 Client/Screens/HomeScreen.tsx create mode 100644 Client/Screens/ProfileScreen.tsx diff --git a/Client/App.tsx b/Client/App.tsx new file mode 100644 index 0000000..b540e41 --- /dev/null +++ b/Client/App.tsx @@ -0,0 +1,39 @@ +import React, {Profiler} from 'react'; +import HomeScreen from './Screens/HomeScreen'; +import {NavigationContainer} from '@react-navigation/native'; +import {createBottomTabNavigator} from '@react-navigation/bottom-tabs'; +import type {Node} from 'react'; +import {SafeAreaView, StyleSheet} from 'react-native'; +import ProfileScreen from './Screens/ProfileScreen'; + +/** + * Sample React Native App + * https://github.com/facebook/react-native + * + * @format + * @flow strict-local + */ + +const Tab = createBottomTabNavigator(); + +const App: () => Node = () => { + return ( + + + + + + + + + ); +}; + +const styles = StyleSheet.create({ + sectionContainer: { + marginTop: 32, + paddingHorizontal: 24, + }, +}); + +export default App; diff --git a/Client/Screens/HomeScreen.tsx b/Client/Screens/HomeScreen.tsx new file mode 100644 index 0000000..610c8a7 --- /dev/null +++ b/Client/Screens/HomeScreen.tsx @@ -0,0 +1,12 @@ +import React from 'react'; +import {Text, View, Button, StyleSheet} from 'react-native'; +const HomeScreen = () => { + return ( + + Home Page! +