Merge branch 'develop' into patch-1

raclim · web-flow · commit 22a5bc83a4a7 · 2024-05-31T17:51:29.000-04:00
diff --git a/client/modules/IDE/pages/IDEView.jsx b/client/modules/IDE/pages/IDEView.jsx
@@ -27,7 +27,6 @@ import {
 } from '../components/Editor/MobileEditor';
 import IDEOverlays from '../components/IDEOverlays';
 import useIsMobile from '../hooks/useIsMobile';
-import { CrossIcon } from '../../../common/icons';
 
 function getTitle(project) {
   const { id } = project;
@@ -105,7 +104,6 @@ const IDEView = () => {
   const [sidebarSize, setSidebarSize] = useState(160);
   const [isOverlayVisible, setIsOverlayVisible] = useState(false);
   const [MaxSize, setMaxSize] = useState(window.innerWidth);
-  const [displayBanner, setDisplayBanner] = useState(true);
 
   const cmRef = useRef({});
 
@@ -116,45 +114,6 @@ const IDEView = () => {
     dispatch(updateFileContent(file.id, file.content));
   };
 
-  const Banner = () => {
-    // temporary banner to display funding opportunities
-    const [textObj, setTextObj] = useState({});
-
-    useEffect(() => {
-      const grant1 = {
-        copy:
-          'Learn to make art with AI with the Social Software High School Summer Institute. Apply by June 1!',
-        url: 'https://summer.ucla.edu/program/social-software-summer-institute/'
-      };
-
-      const grant2 = {
-        copy:
-          'Join us in contributing to p5.js——receive a $10,000 opportunity to grow within the contributor community!',
-        url: 'https://processingfoundation.org/grants'
-      };
-
-      const allMessages = [grant1, grant2];
-      const randomIndex = Math.floor(Math.random() * allMessages.length);
-      const randomMessage = allMessages[randomIndex];
-
-      setTextObj(randomMessage);
-    }, []);
-
-    return (
-      <div className="banner">
-        <a href={textObj.url}>{textObj.copy}</a>
-        <button
-          className="banner-close-button"
-          onClick={() => {
-            setDisplayBanner(!displayBanner);
-          }}
-        >
-          <CrossIcon />
-        </button>
-      </div>
-    );
-  };
-
   useEffect(() => {
     dispatch(clearPersistedState());
   }, [dispatch]);
@@ -211,7 +170,6 @@ const IDEView = () => {
       <Helmet>
         <title>{getTitle(project)}</title>
       </Helmet>
-      {displayBanner && <Banner />}
       <IDEKeyHandlers getContent={() => cmRef.current?.getContent()} />
       <WarnIfUnsavedChanges />
       <Toast />
diff --git a/client/styles/layout/_ide.scss b/client/styles/layout/_ide.scss
@@ -16,29 +16,6 @@
 	width: 100%;
 }
 
-.banner {
-  width: 100%;
-  min-height: 2.2rem;
-  text-align: center;
-  padding: 0.5rem;
-  font-weight: bold;
-  border-bottom: 1px dashed #A6A6A6;
-
-  @media (max-width: 770px) {
-    min-height: 3.3rem;
-  }
-}
-
-.banner-close-button{
-  display: flex;
-  flex-direction: column;
-  align-items: center; 
-  justify-content: center;
-  height: 20px;
-  width:20px;
-  float: right;
-}
-
 .sidebar {
   width: 100%;
   height: 100%;
diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js
@@ -9,8 +9,8 @@ function draw() {
 export const defaultHTML = `<!DOCTYPE html>
 <html lang="en">
   <head>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.3/p5.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.3/addons/p5.sound.min.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.4/p5.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/1.9.4/addons/p5.sound.min.js"></script>
     <link rel="stylesheet" type="text/css" href="style.css">
     <meta charset="utf-8" />
 
diff --git a/translations/locales/ja/translations.json b/translations/locales/ja/translations.json
@@ -358,7 +358,8 @@
       "Description": "ユーザー登録",
       "Or": "もしくは",
       "AlreadyHave": "既にアカウントをお持ちですか？",
-      "Login": "ログイン"
+      "Login": "ログイン",
+      "Warning": "アカウント作成をすると、p5.js エディターの <0>利用規約</0> と <1>プライバシー ポリシー</1> に同意したことになります。"
     },
     "EmailVerificationView": {
       "Title": "p5.js ウェブエディター | メールアドレス認証",
