+
\ No newline at end of file
+
diff --git a/hugo/static/assets/github-mark-header.svg b/hugo/static/assets/github-mark-header.svg
new file mode 100644
index 0000000..95d0c30
--- /dev/null
+++ b/hugo/static/assets/github-mark-header.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/hugo/static/assets/header-background.webp b/hugo/static/assets/header-background.webp
new file mode 100644
index 0000000..bd914d3
Binary files /dev/null and b/hugo/static/assets/header-background.webp differ
diff --git a/hugo/static/assets/home-hero.webp b/hugo/static/assets/home-hero.webp
new file mode 100644
index 0000000..cbe941f
Binary files /dev/null and b/hugo/static/assets/home-hero.webp differ
diff --git a/hugo/static/assets/logo.jpg b/hugo/static/assets/logo.jpg
deleted file mode 100644
index e70f909..0000000
Binary files a/hugo/static/assets/logo.jpg and /dev/null differ
diff --git a/hugo/static/assets/oct-logo-128.png b/hugo/static/assets/oct-logo-128.png
index 62db801..c9ca14b 100644
Binary files a/hugo/static/assets/oct-logo-128.png and b/hugo/static/assets/oct-logo-128.png differ
diff --git a/hugo/static/assets/oct-logo-32.png b/hugo/static/assets/oct-logo-32.png
index dc136af..b666b48 100644
Binary files a/hugo/static/assets/oct-logo-32.png and b/hugo/static/assets/oct-logo-32.png differ
diff --git a/hugo/static/assets/oct-logo-512.png b/hugo/static/assets/oct-logo-512.png
new file mode 100644
index 0000000..080b7dd
Binary files /dev/null and b/hugo/static/assets/oct-logo-512.png differ
diff --git a/hugo/static/assets/oct-logo-acronym.svg b/hugo/static/assets/oct-logo-acronym.svg
new file mode 100644
index 0000000..9f7a011
--- /dev/null
+++ b/hugo/static/assets/oct-logo-acronym.svg
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hugo/static/assets/oct-logo-full.svg b/hugo/static/assets/oct-logo-full.svg
new file mode 100644
index 0000000..aec1d39
--- /dev/null
+++ b/hugo/static/assets/oct-logo-full.svg
@@ -0,0 +1,466 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hugo/static/assets/oct-space.jpg b/hugo/static/assets/oct-space.jpg
deleted file mode 100644
index 5322179..0000000
Binary files a/hugo/static/assets/oct-space.jpg and /dev/null differ
diff --git a/hugo/static/assets/twitter.svg b/hugo/static/assets/twitter.svg
deleted file mode 100644
index 872abaf..0000000
--- a/hugo/static/assets/twitter.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/playground/assets/github-mark-header.svg b/playground/assets/github-mark-header.svg
new file mode 100644
index 0000000..95d0c30
--- /dev/null
+++ b/playground/assets/github-mark-header.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/playground/assets/header-background.webp b/playground/assets/header-background.webp
new file mode 100644
index 0000000..bd914d3
Binary files /dev/null and b/playground/assets/header-background.webp differ
diff --git a/playground/assets/logo.jpg b/playground/assets/logo.jpg
deleted file mode 100644
index e70f909..0000000
Binary files a/playground/assets/logo.jpg and /dev/null differ
diff --git a/playground/assets/oct-logo-acronym.svg b/playground/assets/oct-logo-acronym.svg
new file mode 100644
index 0000000..9f7a011
--- /dev/null
+++ b/playground/assets/oct-logo-acronym.svg
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/playground/esbuild.mjs b/playground/esbuild.mjs
index 403c191..41ab765 100644
--- a/playground/esbuild.mjs
+++ b/playground/esbuild.mjs
@@ -12,6 +12,7 @@ const ctx = await esbuild.context({
'.png': 'file',
'.ttf': 'file'
},
+ external: ['/assets/header-background.webp'],
platform: 'browser',
sourcemap: false,
minify: true,
diff --git a/playground/index.html b/playground/index.html
index 3169daa..5b95734 100644
--- a/playground/index.html
+++ b/playground/index.html
@@ -20,7 +20,7 @@
-
+
-
+
-
+
diff --git a/playground/src/components/App.tsx b/playground/src/components/App.tsx
index df65cab..f4a7eb7 100644
--- a/playground/src/components/App.tsx
+++ b/playground/src/components/App.tsx
@@ -13,7 +13,8 @@ import { StartButtons } from "./StartButtons.js";
import { RoomTokenInput } from "./RoomTokenInput.js";
import { MonacoEditorPage } from "./MonacoEditorPage.js";
-const SERVER_URL = 'https://api.open-collab.tools';
+// const SERVER_URL = 'https://api.open-collab.tools';
+const SERVER_URL = 'http://localhost:8100';
type pages = 'login' | 'editor' | 'startButtons' | 'joinInput' | 'loading';
@@ -69,7 +70,9 @@ export function App() {
}
}
}
- setInitialPage();
+ if(!localStorage.getItem('loginprocess')) {
+ setInitialPage();
+ }
window.addEventListener('popstate', (event) => {
setInitialPage();
});
@@ -122,9 +125,12 @@ export function App() {
setPage('loading');
setTask(token);
collabApi && collabApi.joinRoom(token).then(res => {
- setTask()
+ if(!localStorage.getItem('loginprocess')) {
+ setTask()
+ }
if (res) {
console.log('Joined room');
+ localStorage.removeItem('loginprocess');
setRoomToken(token);
setPage('editor');
} else {
@@ -151,7 +157,7 @@ export function App() {
case 'loading':
return
;
case 'login':
- return
+ return
case 'editor':
@@ -159,7 +165,7 @@ export function App() {
;
case 'joinInput':
- return
+ return
;
default:
@@ -178,7 +184,7 @@ export function App() {
const container = () => {
return (
-
+
{content()}
)
@@ -191,7 +197,7 @@ export function App() {
export function Spinner() {
return (
-
+
);
}
diff --git a/playground/src/components/FileInfo.tsx b/playground/src/components/FileInfo.tsx
index 06cc9b3..6905785 100644
--- a/playground/src/components/FileInfo.tsx
+++ b/playground/src/components/FileInfo.tsx
@@ -66,7 +66,7 @@ export const FileInfo = ({collabApi, onFileNameChange}: FileInfoProps) => {
onChange={handleFileNameChange}
onKeyDown={handleKeyDown}
placeholder="Enter a file name"
- className={`px-2 py-0.5 border rounded focus:outline-none focus:ring-2 focus:ring-eminence focus:border-transparent w-full ${
+ className={`px-2 py-0.5 border rounded focus:outline-none focus:ring-2 focus:ring-octoLilac focus:border-transparent w-full ${
!isFileNameValid
? 'border-red-500'
: isDirty
@@ -79,8 +79,8 @@ export const FileInfo = ({collabApi, onFileNameChange}: FileInfoProps) => {
disabled={!isFileNameValid || !isDirty}
className={`px-4 py-0.5 rounded ${
isFileNameValid && isDirty
- ? 'bg-eminence text-white hover:bg-eminence-dark'
- : 'bg-gray-300 text-gray-500 cursor-not-allowed'
+ ? 'bg-eminence text-white hover:bg-darkBlue border border-octoLilac'
+ : 'bg-darkBlue text-octoLilac cursor-not-allowed border border-octoLilac'
}`}
>
Apply
diff --git a/playground/src/components/Login.tsx b/playground/src/components/Login.tsx
index 9911c36..defb43e 100644
--- a/playground/src/components/Login.tsx
+++ b/playground/src/components/Login.tsx
@@ -48,7 +48,7 @@ export function Login(props: LoginProps) {
return (
-
+
Login
Back
@@ -114,11 +114,19 @@ interface OAuthButtonProps {
}
function OAuthButton({icon, text, alt, serverUrl, endpoint, token, termsAccepted}: OAuthButtonProps) {
- return
+
+ const handleClick = (e: React.MouseEvent) => {
+ e.preventDefault();
+ e.stopPropagation();
+ localStorage.setItem('loginprocess', 'true');
+ window.location.href = `${serverUrl}${endpoint}?token=${token}&redirect=${window.location.href}`;
+ }
+
+ return
-
+
{text}
-
+
}
diff --git a/playground/src/components/MonacoEditorPage.tsx b/playground/src/components/MonacoEditorPage.tsx
index b128197..67b423b 100644
--- a/playground/src/components/MonacoEditorPage.tsx
+++ b/playground/src/components/MonacoEditorPage.tsx
@@ -61,7 +61,7 @@ export const MonacoEditorPage = (props: MonacoEditorPageProps) => {
return (
-
+
diff --git a/playground/src/components/StartButtons.tsx b/playground/src/components/StartButtons.tsx
index 49ed45c..25071bf 100644
--- a/playground/src/components/StartButtons.tsx
+++ b/playground/src/components/StartButtons.tsx
@@ -14,13 +14,13 @@ export type StartButtonsProps = {
export function StartButtons(props: StartButtonsProps) {
return
Create Room
Join Room
diff --git a/playground/src/index.tsx b/playground/src/index.tsx
index 373a639..7e97476 100644
--- a/playground/src/index.tsx
+++ b/playground/src/index.tsx
@@ -15,23 +15,18 @@ const root = createRoot(container)
root.render(
//
+
@@ -39,7 +34,7 @@ root.render(
-
+
Privacy Policy
•
diff --git a/tailwind/base.tailwind.config.js b/tailwind/base.tailwind.config.js
index a08e6b9..ab3614f 100644
--- a/tailwind/base.tailwind.config.js
+++ b/tailwind/base.tailwind.config.js
@@ -8,8 +8,9 @@ module.exports = {
richBlack: '#020E22',
columbiaBlue: '#CBD3E7',
eminence: '#643B88',
- brightGray: '#E6EAF4',
- darkBlue: '#020E22'
+ octoLilac: '#746ED1',
+ brightGray: '#EDECFA',
+ darkBlue: '#160860'
},
fontFamily: {
barlow: ['Barlow','sans-serif'],
Log in with Google
Log in with GitHub