Skip to content

Commit

Permalink
Merge pull request #47 from jazicorn/dev
Browse files Browse the repository at this point in the history 
Dev
  • Loading branch information
@jazicorn
jazicorn authored Oct 4, 2023
2 parents fd1966e + a9aceb9 commit 28d100b
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 13 deletions.
12 changes: 10 additions & 2 deletions apps/api/src/server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,16 @@ class App {
extended: true
}));
this.app.use(bodyParser.json());
this.app.use(cors({origin:this.corsOptions}));
this.app.use(cookieParser())
this.app.use(cookieParser());
this.app.use(cors({
origin: this.corsOptions
}));
this.app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization");
res.header('Access-Control-Allow-Methods', 'PUT, POST, GET, DELETE, OPTIONS');
next();
});
// this.app.set('trust proxy', 1) // trust first proxy
// this.app.use(session({
// secret: process.env.SECRET_TOKEN,
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/dashboard/D_Route.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ const D_Header = () => {
}

return (
<menu className={`${darkMode ? 'tw-text-campfire-neutral-500' : 'tw-text-campfire-neutral-500'}
tw-shrink-0 tw-flex tw-flex-row tw-h-full tw-w-full tw-font-roboto_mono_medium tw-items-center tw-place-content-between tw-pr-3 `}>
<menu className={`${darkMode ? 'tw-text-campfire-neutral-400 tw-border-campfire-neutral-400' : 'tw-text-campfire-neutral-600'} tw-border-b
tw-shrink-0 tw-flex tw-flex-row tw-h-full tw-w-full tw-font-roboto_mono_medium tw-text-sm tw-items-center tw-place-content-between tw-pr-3`}>
{isMobile ?
<ul>
<ul className='tw-flex tw-flex-row tw-items-center'>
Expand Down
10 changes: 5 additions & 5 deletions apps/web/src/layout/Layout.D_Categories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ const Layout_D_Categories = () => {
<>
{/**Page Content | Position: Relative */}
{isDesktopMDXL || isDesktopXL ?
<main className={`${darkMode ? '[&>*]:tw-bg-neutral-700/90' : '[&>*]:tw-bg-neutral-300/90'}
[&>*]:tw-backdrop-blur-sm [&>*]:tw-rounded tw-border tw-border-transparent tw-w-full tw-h-full
<main className={`${darkMode ? '[&>*]:tw-bg-neutral-700/60' : '[&>*]:tw-bg-neutral-300/60'}
[&>*]:tw-backdrop-blur-sm [&>*]:tw-rounded tw-border tw-border-transparent tw-w-full tw-h-full tw-p-2
tw-grid tw-grid-rows-layout-dashboard-categories-container tw-gap-1`}>
<div className={`${darkMode ? 'tw-divide-campfire-neutral-500 tw-bg-campfire-neutral-600' : 'tw-divide-campfire-neutral-200 '} tw-w-full tw-h-full tw-grid tw-grid-rows-layout-dashboard-categories tw-grid-cols-layout-dashboard-categories tw-p-2`}>
<section className={`${darkMode ? "tw-bg-campfire-neutral-500/50" : "tw-bg-campfire-neutral-100/50"}
tw-col-start-1 tw-col-end-3 tw-row-start-1 tw-row-end-1 tw-p-2 `}>
<div className={`${darkMode ? 'tw-divide-campfire-neutral-500 ' : 'tw-divide-campfire-neutral-200 '} tw-w-full tw-h-full tw-grid tw-grid-rows-layout-dashboard-categories tw-grid-cols-layout-dashboard-categories tw-p-2`}>
<section className={`${darkMode ? "" : ""}
tw-col-start-1 tw-col-end-3 tw-row-start-1 tw-row-end-1 `}>
<Transition>
<D_Route/>
</Transition>
Expand Down
2 changes: 1 addition & 1 deletion apps/web/src/layout/Layout.D_Code.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const Layout_D_Code = () => {
<div className="tw-h-full">
{/**Page Content | Position: Relative */}
{isDesktopLG ?
<main className={`${darkMode ? '[&>*]:tw-backdrop-brightness-25 ' : '[&>*]:tw-backdrop-brightness-85'}
<main className={`${darkMode ? '' : ''} [&>*]:tw-backdrop-brightness-85
tw-bg-transparent tw-w-full tw-h-full [&>*]:tw-backdrop-blur-sm [&>*]:tw-w-full [&>*]:tw-h-full
tw-grid tw-grid-rows-layout-dashboard-code tw-grid-cols-layout-dashboard-code tw-gap-1 [&>*]:tw-rounded tw-border tw-border-transparent`}>
<section className='tw-col-start-1 tw-col-end-3 tw-row-start-1 tw-row-end-1'>
Expand Down
6 changes: 3 additions & 3 deletions apps/web/tailwind.campfire.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ export default {
'dashboard-no-language-mobile': '3em, 28em, auto, auto, auto',
'layout-dashboard-home': '3.5em, auto',
'layout-dashboard-home-mobile': '3.5em, auto, minmax(20em, auto)',
'layout-dashboard-code': '3.2em, 3.2em, 25.2em, minmax(15.8em, auto)',
'layout-dashboard-code-mobile': '3em, 3em, minmax(20em, auto), minmax(25.2em, auto), minmax(18em, auto)',
'layout-dashboard-code': '2.5em, 3.2em, 25.2em, minmax(15.8em, auto)',
'layout-dashboard-code-mobile': '2em, 3em, minmax(20em, auto), minmax(25.2em, auto), minmax(18em, auto)',
'layout-dashboard-code-editor': '28.3em, minmax(15.8em, auto)',
'layout-dashboard-code-editor-mobile': 'minmax(20em, auto), minmax(22em, auto), minmax(10em, auto)',
'layout-dashboard-categories': '3.2em, 3.2em, auto',
'layout-dashboard-categories': '2.5em, 3.2em, auto',
'layout-dashboard-categories-mobile': 'auto',
'layout-dashboard-categories-container': 'minmax(35.7em, auto)',
'layout-dashboard-categories-container-mobile': 'auto',
Expand Down

1 comment on commit 28d100b

@vercel
Copy link

@vercel vercel bot commented on 28d100b Oct 4, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

recodecamp-api – ./apps/api

recodecamp-api.vercel.app
recodecamp-api-jazicorn.vercel.app
recodecamp-api-git-main-jazicorn.vercel.app

Please sign in to comment.