diff --git a/client/.gitignore b/client/.gitignore deleted file mode 100644 index 4d29575..0000000 --- a/client/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* diff --git a/client/package.json b/package.json similarity index 100% rename from client/package.json rename to package.json diff --git a/client/public/index.html b/public/index.html similarity index 100% rename from client/public/index.html rename to public/index.html diff --git a/server/app.ts b/server/app.ts deleted file mode 100644 index 76b1614..0000000 --- a/server/app.ts +++ /dev/null @@ -1,18 +0,0 @@ -import express from "express"; -import configRoutes from "./routes/index"; -import cors from "cors"; - -const PORT = 8000; - -const app = express(); - -app.use(express.json()); -app.use(express.urlencoded({ extended: true })); -app.use("/public", express.static("public")); -app.use(cors()); - -configRoutes(app); - -app.listen(PORT, () => { - console.log(`Server live @ http://localhost:${PORT}`); -}); diff --git a/server/metadata/projects.ts b/server/metadata/projects.ts deleted file mode 100644 index cb27ecf..0000000 --- a/server/metadata/projects.ts +++ /dev/null @@ -1,67 +0,0 @@ -export interface ProjectContent { - title: string; - subtitle: string; - description: string; - link: string; - linkText: string; - buttonImgPath: string; -} - -const projects: Array = [ - { - title: "SimpleMusic Transfer", - subtitle: "Swift/Web API Playlist Transfer App", - description: - "SimpleMusic is an app that allows users to match and transfer playlists across platforms. Built using SwiftUI, SwiftData, MusicKit, and the Spotify Web API, SimpleMusic provides an easy-to-use interface that makes transferring playlists straightforward.", - link: "https://github.com/jharrisong830/SimpleMusicDemo", - linkText: "View on GitHub", - buttonImgPath: "/link_icons/github-mark.svg" - }, - { - title: "SimpleHW", - subtitle: "Pure Swift/SwiftUI App", - description: - "A simple app for keeping track of homework assignments. Add classes, assignments, due dates, and notifications. Separate from my coursework and self-taught with online resources and documentation from Apple.", - link: "https://apps.apple.com/app/id6450715380", - linkText: "View on App Store", - buttonImgPath: "/link_icons/app.svg" - }, - { - title: "SimpleHW", - subtitle: "Pure Swift/SwiftUI App", - description: - "A simple app for keeping track of homework assignments. Add classes, assignments, due dates, and notifications. Separate from my coursework and self-taught with online resources and documentation from Apple.", - link: "https://apps.apple.com/app/id6450715380", - linkText: "View on App Store", - buttonImgPath: "/link_icons/app.svg" - }, - { - title: "SimpleHW", - subtitle: "Pure Swift/SwiftUI App", - description: - "A simple app for keeping track of homework assignments. Add classes, assignments, due dates, and notifications. Separate from my coursework and self-taught with online resources and documentation from Apple.", - link: "https://apps.apple.com/app/id6450715380", - linkText: "View on App Store", - buttonImgPath: "/link_icons/app.svg" - }, - { - title: "SimpleHW", - subtitle: "Pure Swift/SwiftUI App", - description: - "A simple app for keeping track of homework assignments. Add classes, assignments, due dates, and notifications. Separate from my coursework and self-taught with online resources and documentation from Apple.", - link: "https://apps.apple.com/app/id6450715380", - linkText: "View on App Store", - buttonImgPath: "/link_icons/app.svg" - }, - { - title: "SimpleHW", - subtitle: "Pure Swift/SwiftUI App", - description: - "A simple app for keeping track of homework assignments. Add classes, assignments, due dates, and notifications. Separate from my coursework and self-taught with online resources and documentation from Apple.", - link: "https://apps.apple.com/app/id6450715380", - linkText: "View on App Store", - buttonImgPath: "/link_icons/app.svg" - } -]; - -export default projects; diff --git a/server/package.json b/server/package.json deleted file mode 100644 index a1bf468..0000000 --- a/server/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "jhg-app-server", - "version": "1.0.0", - "main": "./build/app.js", - "scripts": { - "build": "npx tsc", - "start": "node ./build/app.js", - "dev": "npm run build && npm start" - }, - "author": "John Graham", - "license": "MIT", - "description": "", - "devDependencies": { - "@types/express": "^4.17.21", - "prettier": "^3.3.3", - "typescript": "^5.5.4" - }, - "dependencies": { - "@types/cors": "^2.8.17", - "cors": "^2.8.5", - "express": "^4.19.2" - } -} diff --git a/server/routes/index.ts b/server/routes/index.ts deleted file mode 100644 index 55864b3..0000000 --- a/server/routes/index.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Application } from "express"; -import projectData from "../metadata/projects"; - -export default function configRoutes(app: Application) { - app.use("/projects", (req, res) => { - return res.json(projectData); - }); - - app.use("*", (req, res) => { - return res.status(404).json({ error: "page does not exist" }); - }); -} diff --git a/server/tsconfig.json b/server/tsconfig.json deleted file mode 100644 index 971dcbf..0000000 --- a/server/tsconfig.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */, - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "commonjs" /* Specify what module code is generated. */, - // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ - // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ - // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ - // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - "outDir": "./build/" /* Specify an output folder for all emitted files. */, - "removeComments": true /* Disable emitting comments. */, - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ - // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */, - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */, - - /* Type Checking */ - "strict": true /* Enable all strict type-checking options. */, - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - } -} diff --git a/client/src/Home.tsx b/src/Home.tsx similarity index 100% rename from client/src/Home.tsx rename to src/Home.tsx diff --git a/client/src/Projects.tsx b/src/Projects.tsx similarity index 100% rename from client/src/Projects.tsx rename to src/Projects.tsx diff --git a/client/src/api/projects.ts b/src/api/projects.ts similarity index 100% rename from client/src/api/projects.ts rename to src/api/projects.ts diff --git a/client/src/components/Navbar.tsx b/src/components/Navbar.tsx similarity index 100% rename from client/src/components/Navbar.tsx rename to src/components/Navbar.tsx diff --git a/client/src/components/ProjectCard.tsx b/src/components/ProjectCard.tsx similarity index 100% rename from client/src/components/ProjectCard.tsx rename to src/components/ProjectCard.tsx diff --git a/client/src/components/ProjectSpotlight.tsx b/src/components/ProjectSpotlight.tsx similarity index 100% rename from client/src/components/ProjectSpotlight.tsx rename to src/components/ProjectSpotlight.tsx diff --git a/client/src/index.tsx b/src/index.tsx similarity index 100% rename from client/src/index.tsx rename to src/index.tsx diff --git a/client/src/styles/index.css b/src/styles/index.css similarity index 100% rename from client/src/styles/index.css rename to src/styles/index.css diff --git a/client/tsconfig.json b/tsconfig.json similarity index 100% rename from client/tsconfig.json rename to tsconfig.json