Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark #27

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

Mark #27

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
902764a
Setup prettier ✨
markwitt1 Apr 8, 2024
b4b6a5c
Ran `npm run format:fix`
markwitt1 Apr 8, 2024
1093f7d
Enable formatOnSave
markwitt1 Apr 8, 2024
2f4fff6
Remove redundant metadata (check https://nextjs.org/docs/app/building…
markwitt1 Apr 8, 2024
69169f0
Redesign content.ts to be single source of truth
markwitt1 Apr 8, 2024
dbd5530
Proposal: Refactor App to completely abstract away content from UI co…
markwitt1 Apr 10, 2024
34f5adb
Add @typescript-eslint/recommended for better linting such as no-unus…
markwitt1 Apr 10, 2024
0c98c4f
Redo Sidebar using ShadCN accordion. Improve Routing. Refactor quiz c…
markwitt1 Apr 10, 2024
bf3b68f
randomize question options
markwitt1 Apr 10, 2024
55ed4fc
Add ESLint rule to only warn about unused variables instead of errori…
markwitt1 Apr 10, 2024
57b1d37
Update NavBar to get chapters from props
markwitt1 Apr 10, 2024
aa40a94
Adjust Question component to support quiz mode + implement quiz mode
markwitt1 Apr 11, 2024
e936fc9
Adopt StartScreen and EndScreen for quiz
markwitt1 Apr 11, 2024
3e8f2dd
Cleanup unused files
markwitt1 Apr 11, 2024
10e4628
Implement Retry Feature
markwitt1 Apr 15, 2024
d74f975
Install Posthog (https://eu.posthog.com/project/20336/onboarding/prod…
markwitt1 Apr 15, 2024
471e718
Add PostHog event tracking to quiz and chapter pages
markwitt1 Apr 15, 2024
565e9f2
Add `prettier-plugin-tailwindcss`https://tailwindcss.com/blog/automat…
markwitt1 Apr 15, 2024
7892cb0
Ran `npx prettier --write .`
markwitt1 Apr 15, 2024
3dcce1e
Fix svg rules
markwitt1 Apr 18, 2024
833df1d
Install dependencies for testing
markwitt1 Apr 20, 2024
dca4866
Setup first test
markwitt1 Apr 20, 2024
434b8ba
Reinstall using pnpm
markwitt1 Apr 21, 2024
3b6a91b
Ignore eslint during build
markwitt1 Apr 21, 2024
dc0b597
Add more example tests
markwitt1 Apr 21, 2024
2352ec3
remove unused script
markwitt1 Apr 21, 2024
b6a9d8c
remove test chapter
markwitt1 Apr 22, 2024
dc40134
Implement keyboard shortcuts as well as fixing button errors
markwitt1 Apr 22, 2024
4d5a77d
Add back showing question index
markwitt1 Apr 24, 2024
87f8bb0
add keyboard shortcut to submit answer
markwitt1 Apr 24, 2024
dd1f7f2
remove sidebar in quiz page
markwitt1 Apr 24, 2024
be4e77f
Authentication
markwitt1 Apr 26, 2024
837d80a
Add documentation
markwitt1 Apr 26, 2024
5b55a08
Add explanation feature using OpenAI and React-Query
markwitt1 Apr 26, 2024
c7f7192
Add documentation for OpenAI feature
markwitt1 Apr 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .concopyuse
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
app/*.tsx
app/**/*.tsx
app/**/**/*.tsx
app/**/**/**/*.tsx
app/**/**/**/**/*.tsx
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"extends": "next/core-web-vitals"
"extends": ["next/core-web-vitals", "prettier"]
}
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

version: 2
updates:
- package-ecosystem: "npm" # See documentation for possible values
directory: "/" # Location of package manifests
- package-ecosystem: 'npm' # See documentation for possible values
directory: '/' # Location of package manifests
schedule:
interval: "weekly"
interval: 'weekly'
7 changes: 7 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"trailingComma": "es5",
"semi": true,
"tabWidth": 2,
"singleQuote": true,
"jsxSingleQuote": true
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}
31 changes: 7 additions & 24 deletions app/basic-propositional-logic/page.tsx
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @markwitt1, can you explain these changes?

Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
import { Sidebar } from '@/components/sidebar';
import TopicTable from '@/components/topicTable';
import { Sidebar } from "@/components/sidebar";
import TopicTable from "@/components/topicTable";

export const metadata = {
title: 'Logicola | Basic Propositional Logic',
title: "Logicola | Basic Propositional Logic",
description:
'Basic Propositional Logic exercises. Translating from natural language to symbolic form. LogiCola is a program to help students learn logic.',
creator: 'Malik Piara',
keywords: [
'logic',
'propositional logic',
'introduction to logic',
'basic propositional logic',
'propositional logic translations',
'download logicola',
],
publisher: 'Malik Piara',
openGraph: {
images: '/malik_mini.jpeg',
authors: ['Malik'],
},
icons: {
icon: '/next.svg',
},
"Basic Propositional Logic exercises. Translating from natural language to symbolic form. LogiCola is a program to help students learn logic.",
};

export default function BasicPropositionalLogic() {
return (
<>
<div className='flex w-full h-screen overflow-scroll'>
<div className="flex w-full h-screen overflow-scroll">
<Sidebar />
<div className='p-4 w-full'>
<h1 className='mb-6 text-3xl font-bold text-gray-900'>
<div className="p-4 w-full">
<h1 className="mb-6 text-3xl font-bold text-gray-900">
Chapter 6: Basic Propositional Logic
</h1>
<TopicTable />
Expand Down
24 changes: 12 additions & 12 deletions app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
@tailwind utilities;

.animate-in {
animation: animateIn 0.3s ease 0.15s both;
animation: animateIn 0.3s ease 0.15s both;
}

@keyframes animateIn {
from {
opacity: 0;
transform: translateY(10px);
}
to {
opacity: 1;
transform: translateY(0);
}

@keyframes animateIn {
from {
opacity: 0;
transform: translateY(10px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
}
31 changes: 7 additions & 24 deletions app/informal/page.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
import { Sidebar } from '@/components/sidebar';
import TopicTable from '@/components/topicTable';
import { Sidebar } from "@/components/sidebar";
import TopicTable from "@/components/topicTable";

export const metadata = {
title: 'Logicola | Informal Logic',
title: "Logicola | Informal Logic",
description:
'Basic Propositional Logic exercises. Translating from natural language to symbolic form. LogiCola is a program to help students learn logic.',
creator: 'Malik Piara',
keywords: [
'logic',
'propositional logic',
'introduction to logic',
'basic propositional logic',
'propositional logic translations',
'download logicola',
],
publisher: 'Malik Piara',
openGraph: {
images: '/malik_mini.jpeg',
authors: ['Malik'],
},
icons: {
icon: '/next.svg',
},
"Informal Logic exercises. Translating from natural language to symbolic form. LogiCola is a program to help students learn logic.",
};

export default function BasicPropositionalLogic() {
return (
<>
<div className='flex w-full h-screen overflow-scroll'>
<div className="flex w-full h-screen overflow-scroll">
<Sidebar />
<div className='p-4 w-full'>
<h1 className='mb-6 text-3xl font-bold text-gray-900'>
<div className="p-4 w-full">
<h1 className="mb-6 text-3xl font-bold text-gray-900">
Chapter 3: Informal Logic
</h1>
{/* <TopicTable /> */}
Expand Down
4 changes: 2 additions & 2 deletions components/NoSSR/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import dynamic from "next/dynamic";
import React from "react";
import dynamic from 'next/dynamic';
import React from 'react';

const NoSSR = (props: any) => <React.Fragment>{props.children}</React.Fragment>;

Expand Down
4 changes: 2 additions & 2 deletions next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @type {import('next').NextConfig}
*/
const nextConfig = {
reactStrictMode: false
reactStrictMode: false,
};

export default nextConfig;
export default nextConfig;
Loading